Merge from emacs-24; up to r111208
authorGlenn Morris <rgm@gnu.org>
Wed, 30 Jan 2013 17:16:30 +0000 (09:16 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 30 Jan 2013 17:16:30 +0000 (09:16 -0800)
commit51cbaf71d49ed7e745cbf0a85f2f6dcc9654a414
tree0ec2df5c6cf6f9fc07c530302e69f9bad4478d36
parent61e601e39cf82f3424c40c852267c254b774fd51
parenta0632c03ded7d3b981c8738e01aafcb19dbb845a
Merge from emacs-24; up to r111208
lisp/ChangeLog
lisp/progmodes/python.el